mmap: Remember the MAP_FIXED flag as VM_FIXED

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Gbp-Pq: Topic bugfix/x86
Gbp-Pq: Name mmap-remember-the-map_fixed-flag-as-vm_fixed.patch

diff --git a/include/linux/mm.h b/include/linux/mm.h
index bcdac8c28fa3bfc0ace5dd4f25e00400943df44a..1ec979122a9553413a527716a1f85705f52ec86c 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -190,6 +190,7 @@ extern unsigned int kobjsize(const void *objp);
 #define VM_ACCOUNT     0x00100000      /* Is a VM accounted object */
 #define VM_NORESERVE   0x00200000      /* should the VM suppress accounting */
 #define VM_HUGETLB     0x00400000      /* Huge TLB Page VM */
+#define VM_FIXED       0x00800000      /* Allocated at fixed address */
 #define VM_ARCH_1      0x01000000      /* Architecture-specific flag */
 #define VM_WIPEONFORK  0x02000000      /* Wipe VMA contents in child. */
 #define VM_DONTDUMP    0x04000000      /* Do not include in the core dump */

diff --git a/include/linux/mman.h b/include/linux/mman.h
index 7c87b6652244f191b1276dab72d9e60e41a2e72b..f22c15d5e24cc2f7ea124922b650e9a66556e984 100644 (file)
--- a/include/linux/mman.h
+++ b/include/linux/mman.h
@@ -87,7 +87,8 @@ calc_vm_flag_bits(unsigned long flags)
 {
        return _calc_vm_trans(flags, MAP_GROWSDOWN,  VM_GROWSDOWN ) |
               _calc_vm_trans(flags, MAP_DENYWRITE,  VM_DENYWRITE ) |
-              _calc_vm_trans(flags, MAP_LOCKED,     VM_LOCKED    );
+              _calc_vm_trans(flags, MAP_LOCKED,     VM_LOCKED    ) |
+              _calc_vm_trans(flags, MAP_FIXED,      VM_FIXED     );
 }
 
 unsigned long vm_commit_limit(void);